From cc951ac6c88915585a5451da8260c27920e8cd06 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 15 Feb 2018 13:29:38 +0100 Subject: [PATCH] gtkbookmarksmanager: Use GTK+ 3.0's bookmarks file There's no reason to use a separate file until the format of the file changes though, as this just means that GTK+ 3.x and GTK+ 4.x applications would end up showing different bookmarks in the file chooser. https://bugzilla.gnome.org/show_bug.cgi?id=793425 --- gtk/gtkbookmarksmanager.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkbookmarksmanager.c b/gtk/gtkbookmarksmanager.c index f97d5afe98..31f83fd4dc 100644 --- a/gtk/gtkbookmarksmanager.c +++ b/gtk/gtkbookmarksmanager.c @@ -73,7 +73,11 @@ get_bookmarks_file (void) GFile *file; gchar *filename; - filename = g_build_filename (g_get_user_config_dir (), "gtk-4.0", "bookmarks", NULL); + /* Use gtk-3.0's bookmarks file as the format didn't change. + * Add the 3.0 file format to get_legacy_bookmarks_file() when + * the format does change. + */ + filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); file = g_file_new_for_path (filename); g_free (filename); -- 2.30.2